Drop gdk_display_get_device_manager API

GdkDeviceManager is being replaced by GdkSeat.

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 1eaae400a26e969d00b22a8a81199274ef512b67..a2676fcce72c78e8c7cfa96602ae21449c4062ad 100644 (file)
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -75,7 +75,6 @@ GdkDisplay
 gdk_display_open
 gdk_display_get_default
 gdk_display_get_name
-gdk_display_get_device_manager
 gdk_display_device_is_grabbed
 gdk_display_beep
 gdk_display_sync

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 0d51b96811671943e13e6d87237c961025712552..630815df259e75d65562bb1ccddbdcd1f4e42df9 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1079,20 +1079,6 @@ gdk_display_device_is_grabbed (GdkDisplay *display,
   return (info && !info->implicit);
 }
 
-/**
- * gdk_display_get_device_manager:
- * @display: a #GdkDisplay.
- *
- * Returns the #GdkDeviceManager associated to @display.
- *
- * Returns: (nullable) (transfer none): A #GdkDeviceManager, or
- *          %NULL. This memory is owned by GDK and must not be freed
- *          or unreferenced.
- *
- * Since: 3.0
- *
- * Deprecated: 3.20. Use gdk_display_get_default_seat() and #GdkSeat operations.
- **/
 GdkDeviceManager *
 gdk_display_get_device_manager (GdkDisplay *display)
 {

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index cf82ec214d16da939fc09c6c385b886f4b58fc49..18071b925fb18d30ad4aa9b645e45bbcb73a9569 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -117,9 +117,6 @@ GDK_AVAILABLE_IN_ALL
 void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
                                                 const gchar   *startup_id);
 
-GDK_DEPRECATED_IN_3_20_FOR(gdk_display_get_default_seat)
-GdkDeviceManager * gdk_display_get_device_manager (GdkDisplay *display);
-
 GDK_AVAILABLE_IN_ALL
 GdkAppLaunchContext *gdk_display_get_app_launch_context (GdkDisplay *display);
 

diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index 9c5dac24ede429193b959cd469daf26a80ffa897..1bcbea6e3b70b64a203c0a5d11f98433dbb1045d 100644 (file)
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -306,6 +306,9 @@ void                gdk_display_emit_opened           (GdkDisplay       *display
 void                gdk_display_setting_changed       (GdkDisplay       *display,
                                                        const char       *name);
 
+GdkDeviceManager *  gdk_display_get_device_manager    (GdkDisplay *display);
+
+
 G_END_DECLS
 
 #endif  /* __GDK_DISPLAY_PRIVATE_H__ */